]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
network: don't crash because a device doesn't have a description yet
authorGiovanni Campagna <gcampagna@src.gnome.org>
Sun, 18 Aug 2013 18:16:49 +0000 (20:16 +0200)
committerGiovanni Campagna <gcampagna@src.gnome.org>
Sat, 31 Aug 2013 16:52:01 +0000 (18:52 +0200)
Descriptions are only added after all devices are read (thanks
to the disambiguation in libnm-gtk), but we use them immediately
when we call _sync() in various points (such as checkConnection())

https://bugzilla.gnome.org/show_bug.cgi?id=706262

js/ui/status/network.js

index e7861053232253c354a856e7b845c0e37d551bf9..e751980c6e4ca32f0d9a3000ef135367960ed267 100644 (file)
@@ -182,7 +182,14 @@ const NMConnectionSection = new Lang.Class({
 
         this.item.status.text = this._getStatus();
         this.item.icon.icon_name = this._getMenuIcon();
-        this.item.label.text = this._getDescription();
+
+        // desc can be undefined at cold-plug, before we called
+        // NMGtk.disambiguate_device_names() at least once
+        let desc = this._getDescription();
+        if (desc)
+            this.item.label.text = desc;
+        else
+            this.item.label.text = '';
     },
 
     _getStatus: function() {